From 0a0f9eaf4801cfcb5ab9e1416ec08b46b7db8d5e Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 7 Nov 2008 16:50:29 +0000 Subject: [PATCH] argh, actually call the newly added private gtk_paned_calc_position() 2008-11-07 Michael Natterer * gtk/gtkpaned.c: argh, actually call the newly added private gtk_paned_calc_position() instead of the deprecated public version. svn path=/trunk/; revision=21774 --- ChangeLog | 6 ++++++ gtk/gtkpaned.c | 26 +++++++++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index c725e643d6..7954e9559a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-11-07 Michael Natterer + + * gtk/gtkpaned.c: argh, actually call the newly added private + gtk_paned_calc_position() instead of the deprecated public + version. + 2008-11-07 Michael Natterer Bug 553586 – Add orientation API to GtkPaned diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index a1ed20c1bc..b774937f51 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -843,12 +843,12 @@ gtk_paned_size_allocate (GtkWidget *widget, if (paned->priv->orientation == GTK_ORIENTATION_HORIZONTAL) { - gtk_paned_compute_position (paned, - MAX (1, widget->allocation.width - - handle_size - - 2 * border_width), - child1_requisition.width, - child2_requisition.width); + gtk_paned_calc_position (paned, + MAX (1, widget->allocation.width + - handle_size + - 2 * border_width), + child1_requisition.width, + child2_requisition.width); paned->handle_pos.x = widget->allocation.x + paned->child1_size + border_width; paned->handle_pos.y = widget->allocation.y + border_width; @@ -872,12 +872,12 @@ gtk_paned_size_allocate (GtkWidget *widget, } else { - gtk_paned_compute_position (paned, - MAX (1, widget->allocation.height - - handle_size - - 2 * border_width), - child1_requisition.height, - child2_requisition.height); + gtk_paned_calc_position (paned, + MAX (1, widget->allocation.height + - handle_size + - 2 * border_width), + child1_requisition.height, + child2_requisition.height); paned->handle_pos.x = widget->allocation.x + border_width; paned->handle_pos.y = widget->allocation.y + paned->child1_size + border_width; @@ -1501,7 +1501,7 @@ gtk_paned_set_position (GtkPaned *paned, * if the total allocation changes at the same time * as the position, the position set is with reference * to the new total size. If only the position changes, - * then clamping will occur in gtk_paned_compute_position() + * then clamping will occur in gtk_paned_calc_position() */ paned->child1_size = position; -- 2.30.2